From 499b4bb60fd5e68546740d932c09071e92f43f38 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Oct 2013 16:20:02 -0400 Subject: [PATCH] gtkoverlay: Remove get_preferred_width / get_preferred_height implementation GtkBin now handles this for us. --- gtk/gtkoverlay.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 59eefbf8fe..59a8fa73b8 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -309,44 +309,6 @@ gtk_overlay_child_allocate (GtkOverlay *overlay, gtk_widget_size_allocate (child->widget, &child_allocation); } -static void -gtk_overlay_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - GtkBin *bin = GTK_BIN (widget); - GtkWidget *child; - - if (minimum) - *minimum = 0; - - if (natural) - *natural = 0; - - child = gtk_bin_get_child (bin); - if (child && gtk_widget_get_visible (child)) - gtk_widget_get_preferred_width (child, minimum, natural); -} - -static void -gtk_overlay_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural) -{ - GtkBin *bin = GTK_BIN (widget); - GtkWidget *child; - - if (minimum) - *minimum = 0; - - if (natural) - *natural = 0; - - child = gtk_bin_get_child (bin); - if (child && gtk_widget_get_visible (child)) - gtk_widget_get_preferred_height (child, minimum, natural); -} - static void gtk_overlay_size_allocate (GtkWidget *widget, GtkAllocation *allocation) @@ -609,8 +571,6 @@ gtk_overlay_class_init (GtkOverlayClass *klass) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass); - widget_class->get_preferred_width = gtk_overlay_get_preferred_width; - widget_class->get_preferred_height = gtk_overlay_get_preferred_height; widget_class->size_allocate = gtk_overlay_size_allocate; widget_class->realize = gtk_overlay_realize; widget_class->unrealize = gtk_overlay_unrealize; -- 2.30.2